Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <[email protected]>
Mon, 20 Jan 2014 12:33:42 +0000 (07:33 -0500)
committerTom Rini <[email protected]>
Mon, 20 Jan 2014 12:33:42 +0000 (07:33 -0500)

Trivial merge